Autogenerated HTML docs for v1.7.5-128-g50d30 
diff --git a/config.txt b/config.txt index ce17805..480dd0a 100644 --- a/config.txt +++ b/config.txt 
@@ -641,7 +641,7 @@    branch.<name>.merge:: 	Defines, together with branch.<name>.remote, the upstream branch -	for the given branch. It tells 'git fetch'/'git pull' which +	for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which 	branch to merge and can also affect 'git push' (see push.default). 	When in branch <name>, it tells 'git fetch' the default 	refspec to be marked for merging in FETCH_HEAD. The value is 
diff --git a/diff-options.txt b/diff-options.txt index c93124b..34f0145 100644 --- a/diff-options.txt +++ b/diff-options.txt 
@@ -72,6 +72,10 @@ 	a cut-off percent (3% by default) are not shown. The cut-off percent 	can be set with `--dirstat=<limit>`. Changes in a child directory are not 	counted for the parent directory, unless `--cumulative` is used. ++ +Note that the `--dirstat` option computes the changes while ignoring +the amount of pure code movements within a file. In other words, +rearranging lines in a file is not counted as much as other changes.    --dirstat-by-file[=<limit>]:: 	Same as `--dirstat`, but counts changed files instead of lines. @@ -259,6 +263,19 @@ 	projects, so use it with caution. Giving more than one 	`-C` option has the same effect.   +-D:: +--irreversible-delete:: +	Omit the preimage for deletes, i.e. print only the header but not +	the diff between the preimage and `/dev/null`. The resulting patch +	is not meant to be applied with `patch` nor `git apply`; this is +	solely for people who want to just concentrate on reviewing the +	text after the change. In addition, the output obviously lack +	enough information to apply such a patch in reverse, even manually, +	hence the name of the option. ++ +When used together with `-B`, omit also the preimage in the deletion part +of a delete/create pair. +  -l<num>:: 	The `-M` and `-C` options require O(n^2) processing time where n 	is the number of potential rename/copy targets. This 
diff --git a/git-config.html b/git-config.html index a606844..46b8d27 100644 --- a/git-config.html +++ b/git-config.html 
@@ -1783,7 +1783,7 @@  <dd>   <p>   Defines, together with branch.&lt;name&gt;.remote, the upstream branch  - for the given branch. It tells <em>git fetch</em>/<em>git pull</em> which  + for the given branch. It tells <em>git fetch</em>/<em>git pull</em>/<em>git rebase</em> which   branch to merge and can also affect <em>git push</em> (see push.default).   When in branch &lt;name&gt;, it tells <em>git fetch</em> the default   refspec to be marked for merging in FETCH_HEAD. The value is  
diff --git a/git-diff-files.html b/git-diff-files.html index 1829e2c..408185e 100644 --- a/git-diff-files.html +++ b/git-diff-files.html 
@@ -523,6 +523,9 @@  can be set with <tt>--dirstat=&lt;limit&gt;</tt>. Changes in a child directory are not   counted for the parent directory, unless <tt>--cumulative</tt> is used.   </p>  +<div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring  +the amount of pure code movements within a file. In other words,  +rearranging lines in a file is not counted as much as other changes.</p></div>   </dd>   <dt class="hdlist1">   --dirstat-by-file[=&lt;limit&gt;]  @@ -817,6 +820,25 @@  </p>   </dd>   <dt class="hdlist1">  +-D  +</dt>  +<dt class="hdlist1">  +--irreversible-delete  +</dt>  +<dd>  +<p>  + Omit the preimage for deletes, i.e. print only the header but not  + the diff between the preimage and <tt>/dev/null</tt>. The resulting patch  + is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is  + solely for people who want to just concentrate on reviewing the  + text after the change. In addition, the output obviously lack  + enough information to apply such a patch in reverse, even manually,  + hence the name of the option.  +</p>  +<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part  +of a delete/create pair.</p></div>  +</dd>  +<dt class="hdlist1">   -l&lt;num&gt;   </dt>   <dd>  
diff --git a/git-diff-index.html b/git-diff-index.html index 4e169aa..0dd554c 100644 --- a/git-diff-index.html +++ b/git-diff-index.html 
@@ -524,6 +524,9 @@  can be set with <tt>--dirstat=&lt;limit&gt;</tt>. Changes in a child directory are not   counted for the parent directory, unless <tt>--cumulative</tt> is used.   </p>  +<div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring  +the amount of pure code movements within a file. In other words,  +rearranging lines in a file is not counted as much as other changes.</p></div>   </dd>   <dt class="hdlist1">   --dirstat-by-file[=&lt;limit&gt;]  @@ -818,6 +821,25 @@  </p>   </dd>   <dt class="hdlist1">  +-D  +</dt>  +<dt class="hdlist1">  +--irreversible-delete  +</dt>  +<dd>  +<p>  + Omit the preimage for deletes, i.e. print only the header but not  + the diff between the preimage and <tt>/dev/null</tt>. The resulting patch  + is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is  + solely for people who want to just concentrate on reviewing the  + text after the change. In addition, the output obviously lack  + enough information to apply such a patch in reverse, even manually,  + hence the name of the option.  +</p>  +<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part  +of a delete/create pair.</p></div>  +</dd>  +<dt class="hdlist1">   -l&lt;num&gt;   </dt>   <dd>  
diff --git a/git-diff-tree.html b/git-diff-tree.html index d9be7c6..61e116b 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html 
@@ -528,6 +528,9 @@  can be set with <tt>--dirstat=&lt;limit&gt;</tt>. Changes in a child directory are not   counted for the parent directory, unless <tt>--cumulative</tt> is used.   </p>  +<div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring  +the amount of pure code movements within a file. In other words,  +rearranging lines in a file is not counted as much as other changes.</p></div>   </dd>   <dt class="hdlist1">   --dirstat-by-file[=&lt;limit&gt;]  @@ -822,6 +825,25 @@  </p>   </dd>   <dt class="hdlist1">  +-D  +</dt>  +<dt class="hdlist1">  +--irreversible-delete  +</dt>  +<dd>  +<p>  + Omit the preimage for deletes, i.e. print only the header but not  + the diff between the preimage and <tt>/dev/null</tt>. The resulting patch  + is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is  + solely for people who want to just concentrate on reviewing the  + text after the change. In addition, the output obviously lack  + enough information to apply such a patch in reverse, even manually,  + hence the name of the option.  +</p>  +<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part  +of a delete/create pair.</p></div>  +</dd>  +<dt class="hdlist1">   -l&lt;num&gt;   </dt>   <dd>  
diff --git a/git-diff.html b/git-diff.html index 5bb7312..23cb5d0 100644 --- a/git-diff.html +++ b/git-diff.html 
@@ -613,6 +613,9 @@  can be set with <tt>--dirstat=&lt;limit&gt;</tt>. Changes in a child directory are not   counted for the parent directory, unless <tt>--cumulative</tt> is used.   </p>  +<div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring  +the amount of pure code movements within a file. In other words,  +rearranging lines in a file is not counted as much as other changes.</p></div>   </dd>   <dt class="hdlist1">   --dirstat-by-file[=&lt;limit&gt;]  @@ -907,6 +910,25 @@  </p>   </dd>   <dt class="hdlist1">  +-D  +</dt>  +<dt class="hdlist1">  +--irreversible-delete  +</dt>  +<dd>  +<p>  + Omit the preimage for deletes, i.e. print only the header but not  + the diff between the preimage and <tt>/dev/null</tt>. The resulting patch  + is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is  + solely for people who want to just concentrate on reviewing the  + text after the change. In addition, the output obviously lack  + enough information to apply such a patch in reverse, even manually,  + hence the name of the option.  +</p>  +<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part  +of a delete/create pair.</p></div>  +</dd>  +<dt class="hdlist1">   -l&lt;num&gt;   </dt>   <dd>  
diff --git a/git-format-patch.html b/git-format-patch.html index 6dd6c67..e1454e2 100644 --- a/git-format-patch.html +++ b/git-format-patch.html 
@@ -555,6 +555,9 @@  can be set with <tt>--dirstat=&lt;limit&gt;</tt>. Changes in a child directory are not   counted for the parent directory, unless <tt>--cumulative</tt> is used.   </p>  +<div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring  +the amount of pure code movements within a file. In other words,  +rearranging lines in a file is not counted as much as other changes.</p></div>   </dd>   <dt class="hdlist1">   --dirstat-by-file[=&lt;limit&gt;]  @@ -685,6 +688,25 @@  </p>   </dd>   <dt class="hdlist1">  +-D  +</dt>  +<dt class="hdlist1">  +--irreversible-delete  +</dt>  +<dd>  +<p>  + Omit the preimage for deletes, i.e. print only the header but not  + the diff between the preimage and <tt>/dev/null</tt>. The resulting patch  + is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is  + solely for people who want to just concentrate on reviewing the  + text after the change. In addition, the output obviously lack  + enough information to apply such a patch in reverse, even manually,  + hence the name of the option.  +</p>  +<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part  +of a delete/create pair.</p></div>  +</dd>  +<dt class="hdlist1">   -l&lt;num&gt;   </dt>   <dd>  
diff --git a/git-log.html b/git-log.html index 6ce5a54..70a0bb6 100644 --- a/git-log.html +++ b/git-log.html 
@@ -2077,6 +2077,9 @@  can be set with <tt>--dirstat=&lt;limit&gt;</tt>. Changes in a child directory are not   counted for the parent directory, unless <tt>--cumulative</tt> is used.   </p>  +<div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring  +the amount of pure code movements within a file. In other words,  +rearranging lines in a file is not counted as much as other changes.</p></div>   </dd>   <dt class="hdlist1">   --dirstat-by-file[=&lt;limit&gt;]  @@ -2374,6 +2377,25 @@  </p>   </dd>   <dt class="hdlist1">  +-D  +</dt>  +<dt class="hdlist1">  +--irreversible-delete  +</dt>  +<dd>  +<p>  + Omit the preimage for deletes, i.e. print only the header but not  + the diff between the preimage and <tt>/dev/null</tt>. The resulting patch  + is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is  + solely for people who want to just concentrate on reviewing the  + text after the change. In addition, the output obviously lack  + enough information to apply such a patch in reverse, even manually,  + hence the name of the option.  +</p>  +<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part  +of a delete/create pair.</p></div>  +</dd>  +<dt class="hdlist1">   -l&lt;num&gt;   </dt>   <dd>  
diff --git a/git-rebase.html b/git-rebase.html index dca7c88..a846835 100644 --- a/git-rebase.html +++ b/git-rebase.html 
@@ -416,7 +416,7 @@  <div class="sectionbody">   <div class="verseblock">   <div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--onto &lt;newbase&gt;]  - &lt;upstream&gt; [&lt;branch&gt;]  + [&lt;upstream&gt;] [&lt;branch&gt;]   <em>git rebase</em> [-i | --interactive] [options] --onto &lt;newbase&gt;   --root [&lt;branch&gt;]</div>   <div class="verseblock-attribution">  @@ -428,6 +428,11 @@  <div class="paragraph"><p>If &lt;branch&gt; is specified, <em>git rebase</em> will perform an automatic   <tt>git checkout &lt;branch&gt;</tt> before doing anything else. Otherwise   it remains on the current branch.</p></div>  +<div class="paragraph"><p>If &lt;upstream&gt; is not specified, the upstream configured in  +branch.&lt;name&gt;.remote and branch.&lt;name&gt;.merge options will be used; see  +<a href="git-config.html">git-config(1)</a> for details. If you are currently not on any  +branch or if the current branch does not have a configured upstream,  +the rebase will abort.</p></div>   <div class="paragraph"><p>All changes made by commits in the current branch but that are not   in &lt;upstream&gt; are saved to a temporary area. This is the same set   of commits that would be shown by <tt>git log &lt;upstream&gt;..HEAD</tt> (or  @@ -628,7 +633,8 @@  <dd>   <p>   Upstream branch to compare against. May be any valid commit,  - not just an existing branch name.  + not just an existing branch name. Defaults to the configured  + upstream for the current branch.   </p>   </dd>   <dt class="hdlist1">  @@ -1478,7 +1484,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2011-03-15 23:30:14 UTC  +Last updated 2011-04-28 22:25:18 UTC   </div>   </div>   </body>  
diff --git a/git-rebase.txt b/git-rebase.txt index 620d50e..9a075bc 100644 --- a/git-rebase.txt +++ b/git-rebase.txt 
@@ -9,7 +9,7 @@  --------  [verse]  'git rebase' [-i | --interactive] [options] [--onto <newbase>] -	<upstream> [<branch>] +	[<upstream>] [<branch>]  'git rebase' [-i | --interactive] [options] --onto <newbase> 	--root [<branch>]   @@ -21,6 +21,12 @@  `git checkout <branch>` before doing anything else. Otherwise  it remains on the current branch.   +If <upstream> is not specified, the upstream configured in +branch.<name>.remote and branch.<name>.merge options will be used; see +linkgit:git-config[1] for details. If you are currently not on any +branch or if the current branch does not have a configured upstream, +the rebase will abort. +  All changes made by commits in the current branch but that are not  in <upstream> are saved to a temporary area. This is the same set  of commits that would be shown by `git log <upstream>..HEAD` (or @@ -217,7 +223,8 @@    <upstream>:: 	Upstream branch to compare against. May be any valid commit, -	not just an existing branch name. +	not just an existing branch name. Defaults to the configured +	upstream for the current branch.    <branch>:: 	Working branch; defaults to HEAD.